From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 1 Nov 2003 17:35:23 +0000 (+0000)
Subject: (rx-or): Fix the case of "(rx (and ?a (or ?b ?c) ?d))".
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25083
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=31ce86457aefaffe2c820fb46c17f98c4dea1b9a;p=emacs.git

(rx-or): Fix the case of "(rx (and ?a (or ?b ?c) ?d))".
---

diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 8e38aed10d2..bc16a84b156 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -286,9 +286,11 @@ FORM is of the form `(and FORM1 ...)'."
     (dolist (arg (cdr form))
       (unless (stringp arg)
 	(setq all-args-strings nil)))
-    (if all-args-strings
-	(regexp-opt (cdr form))
-      (mapconcat #'rx-to-string (cdr form) "\\|"))))
+    (concat "\\(?:"
+	    (if all-args-strings
+		(regexp-opt (cdr form))
+	      (mapconcat #'rx-to-string (cdr form) "\\|"))
+	    "\\)")))
 
 
 (defun rx-quote-for-set (string)